From: Miles Bader <miles@gnu.org>
Date: Sat, 28 Feb 2004 01:53:35 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23895
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a7f6d81fe9951079f6c4fe395a96f4ec93e2c400;p=emacs.git

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119

src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 08f9bc6e03f..0f5f663abab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-28  Miles Bader  <miles@gnu.org>
+
+	* keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert.
+
 2004-02-28  Kim F. Storm  <storm@cua.dk>
 
 	* keyboard.c (kbd_buffer_store_event_hold): New function to store
diff --git a/src/keyboard.c b/src/keyboard.c
index 7037ee93afd..3e58a2a75a8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1928,7 +1928,12 @@ adjust_point_for_property (last_pt, modified)
 		      : (PT < last_pt ? beg : end));
 	      check_composition = check_display = 1;
 	    }
+#if 0 /* This assertion isn't correct, because SET_PT may end up setting
+	 the point to something other than its argument, due to
+	 point-motion hooks, intangibility, etc.  */
 	  xassert (PT == beg || PT == end);
+#endif
+
 	  /* Pretend the area doesn't exist if the buffer is not
 	     modified.  */
 	  if (!modified && !ellipsis && beg < end)